From 9af42f3598ba6f4b38384fdd2038c30f7ec763b9 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 31 Jul 2013 16:15:49 +0100 Subject: [PATCH] tools: move xm and xend under tools python Signed-off-by: Ian Campbell Reviewed-by: Andrew Cooper Acked-by: Matt Wilson Acked-by: Ian Jackson --- tools/misc/Makefile | 2 +- tools/python/Makefile | 4 ++++ tools/{misc => python/xen/xend}/xend | 0 tools/{misc => python/xen/xm}/xm | 0 4 files changed, 5 insertions(+), 1 deletion(-) rename tools/{misc => python/xen/xend}/xend (100%) rename tools/{misc => python/xen/xm}/xm (100%) diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 520ef809b2..73b55ddc07 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -22,7 +22,7 @@ INSTALL_BIN-y := xencons xencov_split INSTALL_BIN-$(CONFIG_X86) += xen-detect INSTALL_BIN := $(INSTALL_BIN-y) -INSTALL_SBIN-y := xm xen-bugtool xen-python-path xend xenperf xsview xenpm xen-tmem-list-parse gtraceview \ +INSTALL_SBIN-y := xen-bugtool xen-python-path xenperf xsview xenpm xen-tmem-list-parse gtraceview \ gtracestat xenlockprof xenwatchdogd xen-ringwatch xencov INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx xen-hvmcrash xen-lowmemd INSTALL_SBIN-$(CONFIG_MIGRATE) += xen-hptool diff --git a/tools/python/Makefile b/tools/python/Makefile index 9be11225fa..8461d0fe4d 100644 --- a/tools/python/Makefile +++ b/tools/python/Makefile @@ -23,6 +23,10 @@ install: install-dtd CC="$(CC)" CFLAGS="$(CFLAGS)" $(PYTHON) setup.py install \ $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" --force + $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) + $(INSTALL_PYTHON_PROG) xen/xm/xm $(DESTDIR)$(SBINDIR)/xm + $(INSTALL_PYTHON_PROG) xen/xend/xend $(DESTDIR)$(SBINDIR)/xend + install-dtd: all $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/xen $(INSTALL_DATA) xen/xm/create.dtd $(DESTDIR)$(SHAREDIR)/xen diff --git a/tools/misc/xend b/tools/python/xen/xend/xend similarity index 100% rename from tools/misc/xend rename to tools/python/xen/xend/xend diff --git a/tools/misc/xm b/tools/python/xen/xm/xm similarity index 100% rename from tools/misc/xm rename to tools/python/xen/xm/xm -- 2.30.2